Initial Commit
cleanup
fixed merge conflicts