fuck me lots of changes need merged