Rearranged a lot of things, and used more go-like approach for creature methods