cleanups wip
More debugging
Bug fixes
Null pointer fix
Fixes
Clean stuff
More additions and cleanups
stuff
Added Embedded format test
Stuff 2
Merge remote-tracking branch 'connor/Saros2' into saros2