i am making huge changes to this right now - more details in next commit. just trying to transfer my work home