Finished funcitonality. Now time to test