last commit for the night. still some bugs tho.