Rewrote skeleton framework