Did some work

..oh yeah