Ok, finished. Beginning bug fixing (aka, make this work)