second commit. not perfect, but very tired and need sleep. will hopefully be awesome by end of tomorrow.