Reached OM app parity. Actually alot cleaner, will backport design to the cljs version