success, now to clean up code and ensure bugchecking