-Cleaned up code
-Changed interface to simple single view for testing purposes