Finally finished my custom controller