Initial commit
Move stuff around to make it more gemlike