Start structuring things some more
More tweaking, getting somewhere now :-)