Still cleaning this up, will take a look