Getting closer to actually working

Still not quite ready to use.