Merging Hardware Back In

Reformatting and Hardware testing bug fixes all merged and committed.