Waypoint:
 * Getting test cases in
 * Fixing little errors from the cases