Parker Pushing some code
resolving some crap
resolved conflicts