Merged
Deleted extraneous
Up again
Back up
Hooked up APIs