Cleaned up initial scaffolding a bit.