commit for the night; some API functionality is up but it's messy