Finished main coding for application. Moving onto unit tests