Added extension property and started to clean up system.out messages... but more to come