Functionality is complete, minor bugs and UI fixes required