First commit - moved changes to new forked repo