Merged in BayTech changes
Updated features
Integrated more changes from my alternate codebase to work with my
development hardware