1st big commit
merging with remote
trying to make it behave