More functionality again. Finished up coding. Cleared up some bugs.