Shake down (WIP)

Modified