added stubs and reformated bc I am anal