First working commit after fork (Lots of changes)