completed functionality code

moving to styling