Very big change

This will probably warrant version bump to 0.1