massive overhaul - cleaning up repo