Started filling out functions

Mostly sync commit