Front End work

sry to myself for all those big commits… :/