Been a while since my last commit. Almost done with application logic!