last update before going live! most stuff is functional now!