Time to completely revamp this out of date project...