Lots of changes, adding gameplay