moved over stuff from bitbucket