Intermidiate check in of some developed features