Final commit before demo, removed print statements etc.