Added many things, none of which are finished