This is something i know i need to work on