Implement a few more non-functions
Added bug
All unhandled functions now handled.