Added shoddy options screen.
Merged with master