Adding features

Anybody wanna check my work?