Added a little bit more logic to test the system out. Looks good :)