Passing all test, working on layout stuff

for funzies