Updated with the new stuff from the cleanup branch