Overhaul

Signed-off-by: Aniket Pant <me@aniketpant.com>
Merge branch 'develop'