first commit
cleaned up