REALLY moved all of Tobben's code to it's own package