Restructure everything naively and ackwardly~~~