Janet ui

Here goes nothing...this is a very extensive merge.