wip - got rid of a lot of compile errors