Updated to include future features

future features = more errors! :p