Version 1.2.3

Resolved a whole bunch of Pull Requests and consolidated a ton of code. If you have a previously pending pull request, please review it to ensure it's still relevant in this version of master.