Yeah sure this can be cleaned up - I need to get it working first :)