initial commit
merged changes
cleaned up