Lotsa changes. Been to tired to commit before