Basic functionality in place, needs some cleanup