Completed task. Now to clean the code.