Initial complete with some mods