Removed skeleton, stage3 almost complete