Lots of stuff hit in this one

Redmine Ticket #14
YouTrack Tickets: AR-2, AR-13, AR14