almost finished

Just have to check small changes.