Add controller etc

[Not Ready]