More base work (better commitmessages later on)