initial commit (sort of)
fixing merge conflicts