Added more code to the incomplete dev version. Still not for use, though.