finished all the functionality, need to work on some validation and