Just committing what I have for now, VM is acting up :/.