Implemented all of JF's latest things.