More skeleton. Left old static as example for now