[DEV] Begin to implement angular control