Basic functionality up and running, need to flesh out more