Initial push; mostly plotting related. 'Sanitizing' the code as I go