Initial attempt
Fixes and comments