Function stubs, rewrote documentation, refactored handling