Updated code base to reflect the application, now in a functional way