solution not functional...

huge refactor is due, just trying stuff