First commit, mostly working, near push/pull bugged