Clean up skeleton, add simple tests
Stub out server and cleanups