Fixed lots of stuff... This is the new main working activity