bring inline with the ubuntu setup
add some basic loving to try and get this working, as close to the ubuntu one as possible