Cool beans

I can now close #32 and close #6 (one of the big ones)
Also, close #28