move into separate controllers
use the rest stuffs
make names more logical and actually include the important ones in the dist file