0.1a

Added some new stuff and moved a few bits around to make it
neater/easier for me to find things