Started fixing stuff
another thing