Jun 2, 2018

@Fil Once this is complete I would pull it into master and then look to update bx, bn and bs configuration. The changes should be fairly straightforward at that point based on the existing patterns.