Various Changes

Relocating things and adding new features.