Cleaned up code
Merging in changes
Merging in More changes