Sorta complete...but BUGS, BUGS EVERYWHERE :D