Added comments, updated test plan, final commit? :(