Removed username from various places
Added some more functionality for getting time blocks
Testing with the test app