V2 Update

lots of changes cause forgot about committing for a while