oops, forgot i wasn't done working on this, almost done :)