this is pretty much done - hooraysies