API seems to be fully complete, now time for debugging and code clean up