Full rebuilding

GO!!!!!! Added in TODO: flags for stuff that still needs to be
addressed.