really cleaned up repo, still needs a bit of work