Still fixing up some stuff with project skeleton.