Add/insert skeleton, cleaned up some code