Initial work for testing and functionality