Cleaned up function definitionsA
Added package stubs