Removed unecesary objects. Cleaned up code. Added methods for existing objects.