Færdiggjort

Further AE work on multiple projects