Got it mostly done - The JAAS part is done at least