This is still in progress

just committing and stuff