I'm pretty sure we can make it a little bit simpler than that :)