Task 507

Code review my stuff, bro.