Initial commit. Cleaned up quite a bit.