Some more messing around w/ the basic structure