Initial add
Initial work
Fixed missing statics
Initial work
Added return values