Everything is quite the mess now but pushing for the sake of backup and reverting