Some major changes

Starting to actually write it.