major overhaul of pretty much everything
update to remote head