Finished basic features and removed lots of bs.