Finalized first pass

Still missing movement polish