finished everything. kinda forgot to do commit's while working on it...