Working on a couple of changes!

In the meantime call me!