finishing up functionality of application