second commit - less bugs, more polished