Major changes - forgot to commit regularly.