Overall commit. Almost everything implemented, results still faulty.