Lots of new code, Version 0.1.1a