Restructured things a bit...