continue to format code
fuck it; deleting old skeleton
many many formatting changes