Move stuff around
Add support for preferences