Bricks Updated
Added bricks
Refactored for CLI