Code is a bit of a mess and hard to read after pulling it out from Overloaded.

Should re-arrange correctly so may be able to pull some things out into a library for Overloaded to reuse or shadow easily.