Second Commit

Cleaned up code, removed some experimental methods