commit from work computer, changed the app quite a bit and added bunch of comments for testing