Refactored a bit back to the old layout...