Still in rapib dev mode:  Lots of changes..crappy commit message