Changed things around (meaning I re-implemented everything)