commit before making huge changes
fixed collision bugs