Changed names around, and added some small amounts of code as well as basis for pack handling