added functionality
completed main project