Added Controller, handler and unit tests