All fixes done, early implementation of func call