First go at proper packagin