finishing up first hack attempt

NOT TESTED