first big commit. most fundamentals working